Revision: bazaar--merge--1.1--patch-1
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Dec 10 03:20:08 EST 2004
Standard-date: 2004-12-09 16:20:08 GMT
Modified-files: tests/test-star-merge.sh
New-patches: robert.collins@canonical.com--general/bazaar--merge--1.1--patch-1
Summary: test three-way does not conflict on repeated hunks
Keywords: 

